From: oreo639 <oreo6391@gmail.com>
Date: Mon, 27 Jun 2022 20:38:55 +0000 (-0700)
Subject: ibusManager: Avoid double fork triggering parent death in ibus
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~461^2^2~289
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8e87ff29752f4a7cd919795a59a4a03bbb114c4a;p=gnome-shell.git

ibusManager: Avoid double fork triggering parent death in ibus

Use DO_NOT_REAP_CHILD to avoid a double-fork internally since ibus-daemon
refuses to start with init as its parent.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2345>
---

diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index 420459b76..8bcfb3674 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -109,9 +109,11 @@ var IBusManager = class {
             this._tryAppendEnv(env, 'COMPOSE_FILE');
             this._tryAppendEnv(env, 'DISPLAY');
 
-            GLib.spawn_async(
+            // Use DO_NOT_REAP_CHILD to avoid adouble-fork internally
+            // since ibus-daemon refuses to start with init as its parent.
+            const [success_, pid] = GLib.spawn_async(
                 null, cmdLine, env,
-                GLib.SpawnFlags.SEARCH_PATH,
+                GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
                 () => {
                     try {
                         global.context.restore_rlimit_nofile();
@@ -119,6 +121,11 @@ var IBusManager = class {
                     }
                 }
             );
+            GLib.child_watch_add(
+                GLib.PRIORITY_DEFAULT,
+                pid,
+                () => GLib.spawn_close_pid(pid)
+            );
         } catch (e) {
             log(`Failed to launch ibus-daemon: ${e.message}`);
         }